
<!DOCTYPE HTML>
<html lang="zh-hans" >
    <head>
        <meta charset="UTF-8">
        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
        <title>Git · 粥可温-Bug</title>
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta name="description" content="">
        <meta name="generator" content="GitBook 3.2.3">
        
        
        
    
    <link rel="stylesheet" href="../../gitbook/style.css">

    
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-search-pro/search.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-accordion/accordion.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-lightbox/css/lightbox.min.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-highlight/website.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-back-to-top-button/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-splitter/splitter.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-code/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-insert-logo/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-tbfed-pagefooter/footer.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-expandable-chapters/expandable-chapters.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-chapter-fold/chapter-fold.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-page-toc-button/plugin.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-flexible-alerts/style.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-fontsettings/website.css">
                
            
                
                <link rel="stylesheet" href="../../gitbook/gitbook-plugin-theme-comscore/test.css">
                
            
        

    

    
        
    
        
    
        
    
        
    
        
    
        
    

        
    
    
    
    <meta name="HandheldFriendly" content="true"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../../gitbook/images/apple-touch-icon-precomposed-152.png">
    <link rel="shortcut icon" href="../../gitbook/images/favicon.ico" type="image/x-icon">

    
    <link rel="next" href="集合.md" />
    
    
    <link rel="prev" href="数据库.html" />
    

    
        <link rel="shortcut icon" href="config/img/book.png" type="image/x-icon">
    
    
        <link rel="bookmark" href="config/img/book.png" type="image/x-icon">
    
    
        <link rel="apple-touch-icon" sizes="152x152" href="config/img/book.png">
    
    
        <link rel="apple-touch-icon-precomposed" sizes="152x152" href="config/img/book.png">
    
    
        
        <link rel="apple-touch-icon" sizes="120x120" href="config/img/book.png">
        
        <link rel="apple-touch-icon" sizes="180x180" href="config/img/book.png">
        
    
    
        
        <link rel="apple-touch-icon-precomposed" sizes="120x120" href="config/img/book.png">
        
        <link rel="apple-touch-icon-precomposed" sizes="180x180" href="config/img/book.png">
        
    

    </head>
    <body>
        
<div class="book">
    <div class="book-summary">
        
            
<div id="book-search-input" role="search">
    <input type="text" placeholder="输入并搜索" />
</div>

            
                <nav role="navigation">
                


<ul class="summary">
    
    

    

    
        
        
    
        <li class="chapter " data-level="1.1" data-path="../../">
            
                <a href="../../">
            
                    
                    关于我
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.2" >
            
                <span>
            
                    
                    前端
            
                </span>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="1.2.1" data-path="../前端/vue/initVue.html">
            
                <a href="../前端/vue/initVue.html">
            
                    
                    vue
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.2.2" data-path="../前端/vue/页面实时数据监听.html">
            
                <a href="../前端/vue/页面实时数据监听.html">
            
                    
                    页面实时数据监听
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="1.3" >
            
                <span>
            
                    
                    后端
            
                </span>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="1.3.1" data-path="java.html">
            
                <a href="java.html">
            
                    
                    java
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.3.2" data-path="wft.html">
            
                <a href="wft.html">
            
                    
                    wft
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.3.3" data-path="Mybatisplus.html">
            
                <a href="Mybatisplus.html">
            
                    
                    mybatisplus
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.3.4" data-path="数据库.html">
            
                <a href="数据库.html">
            
                    
                    数据库
            
                </a>
            

            
        </li>
    
        <li class="chapter active" data-level="1.3.5" data-path="git.html">
            
                <a href="git.html">
            
                    
                    Git
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.3.6" data-path="集合.md">
            
                <span>
            
                    
                    集合
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="1.4" >
            
                <span>
            
                    
                    其他
            
                </span>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="1.4.1" data-path="../不明所以/其他.html">
            
                <a href="../不明所以/其他.html">
            
                    
                    这到底是什么问题
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

    

    <li class="divider"></li>

    <li>
        <a href="https://www.gitbook.com" target="blank" class="gitbook-link">
            本书使用 GitBook 发布
        </a>
    </li>
</ul>


                </nav>
            
        
    </div>

    <div class="book-body">
        
            <div class="body-inner">
                
                    

<div class="book-header" role="navigation">
    

    <!-- Title -->
    <h1>
        <i class="fa fa-circle-o-notch fa-spin"></i>
        <a href="../.." >Git</a>
    </h1>
</div>




                    <div class="page-wrapper" tabindex="-1" role="main">
                        <div class="page-inner">
                            
<div id="book-search-results">
    <div class="search-noresults">
    
                                <section class="normal markdown-section">
                                
                                <h2 id="git&#x95EE;&#x9898;">Git&#x95EE;&#x9898;</h2>
<p>&#x95EE;&#x9898;&#xFF1A;</p>
<p>git&#x4EE3;&#x7801;&#x63D0;&#x4EA4;&#x3001;&#x63A8;&#x9001;&#x62A5;&#x9519;</p>
<p>You have not concluded your merge(MERGE HEAD exists).hint: Please,  <a href="https://so.csdn.net/so/search?q=commit&amp;spm=1001.2101.3001.7020" target="_blank">commit</a> your changes beforemerging.Exiting because of unfinished merge</p>
<p>&#x89E3;&#x51B3;&#xFF1A;</p>
<p> <code>git reset --merge</code> </p>
<p><a href="C:\Users\yufan.wang\AppData\Roaming\Typora\typora-user-images\image-20231226175318961.png" data-lightbox="98fa2e23-dd83-411e-88cb-acbc076800d3" data-title="image-20231226175318961" target="_blank"><img src="C:\Users\yufan.wang\AppData\Roaming\Typora\typora-user-images\image-20231226175318961.png" alt="image-20231226175318961"></a></p>
<p><code>git push</code></p>
<p>&#x95EE;&#x9898; Git 403  </p>
<blockquote>
<p>Failed to connect to github.com port 443 : Timed out</p>
</blockquote>
<p>&#x89E3;&#x51B3;</p>
<p><a href="https://v0710.top/images/img/image-20230831142312458.png" data-lightbox="ae62aa82-6cbd-4fa0-bf8b-e30c24e0e02d" data-title="image-20230831142312458" target="_blank"><img src="https://v0710.top/images/img/image-20230831142312458.png" alt="image-20230831142312458"></a></p>
<pre><code class="lang-javascript">git config --global http.proxy http:<span class="hljs-comment">//127.0.0.1:7890 </span>
git config --global https.proxy http:<span class="hljs-comment">//127.0.0.1:7890</span>
</code></pre>
<pre><code> Failed to connect to github.com port 443 after 21085 ms: Timed out

 git config --global --unset http.proxy
 git config --global --unset https.proxy
</code></pre><footer class="page-footer"><span class="copyright">Copyright &#xA9; &#x65E0;&#x4EBA;&#x95EE;&#x6211;&#x7CA5;&#x53EF;&#x6E29; all right reserved&#xFF0C;powered by Gitbook</span><span class="footer-modification">&#x6700;&#x540E;&#x66F4;&#x65B0;&#x65F6;&#x95F4;&#xFF1A;
2024-01-18 06:35:38
</span></footer>
                                
                                </section>
                            
    </div>
    <div class="search-results">
        <div class="has-results">
            
            <h1 class="search-results-title"><span class='search-results-count'></span> results matching "<span class='search-query'></span>"</h1>
            <ul class="search-results-list"></ul>
            
        </div>
        <div class="no-results">
            
            <h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
            
        </div>
    </div>
</div>

                        </div>
                    </div>
                
            </div>

            
                
                <a href="数据库.html" class="navigation navigation-prev " aria-label="Previous page: 数据库">
                    <i class="fa fa-angle-left"></i>
                </a>
                
                
                <a href="集合.md" class="navigation navigation-next " aria-label="Next page: 集合">
                    <i class="fa fa-angle-right"></i>
                </a>
                
            
        
    </div>

    <script>
        var gitbook = gitbook || [];
        gitbook.push(function() {
            gitbook.page.hasChanged({"page":{"title":"Git","level":"1.3.5","depth":2,"next":{"title":"集合","level":"1.3.6","depth":2,"path":"bug/后端/集合.md","ref":"bug/后端/集合.md","articles":[]},"previous":{"title":"数据库","level":"1.3.4","depth":2,"path":"bug/后端/数据库.md","ref":"bug/后端/数据库.md","articles":[]},"dir":"ltr"},"config":{"plugins":["-lunr","-search","search-pro","accordion","lightbox","theme-default","theme-comscore","livereload","highlight","back-to-top-button","splitter","hide-element","code","insert-logo","tbfed-pagefooter","expandable-chapters","chapter-fold","-sharing","sharing-plus","page-toc-button","favicon-absolute","flexible-alerts"],"styles":{"ebook":"styles/ebook.css","epub":"styles/epub.css","mobi":"styles/mobi.css","pdf":"styles/pdf.css","print":"styles/print.css","website":"styles/website.css"},"pluginsConfig":{"tbfed-pagefooter":{"copyright":"Copyright &copy 无人问我粥可温","modify_label":"最后更新时间：","modify_format":"YYYY-MM-DD HH:mm:ss"},"chapter-fold":{},"styles":{"website":"config/styles/website.css"},"livereload":{},"splitter":{},"search-pro":{},"accordion":{},"sharing-plus":{"qq":false,"all":["facebook","google","twitter","instapaper","linkedin","pocket","stumbleupon"],"douban":false,"facebook":true,"weibo":false,"instapaper":false,"whatsapp":false,"hatenaBookmark":false,"twitter":true,"messenger":false,"line":false,"vk":false,"pocket":true,"google":false,"viber":false,"stumbleupon":false,"qzone":false,"linkedin":false},"code":{"copyButtons":true},"favicon-absolute":{"appleTouchIconMore":{"120x120":"config/img/book.png","180x180":"config/img/book.png"},"appleTouchIconPrecomposed152":"config/img/book.png","appleTouchIconPrecomposedMore":{"120x120":"config/img/book.png","180x180":"config/img/book.png"},"favicon":"config/img/book.png","bookmark":"config/img/book.png","appleTouchIcon152":"config/img/book.png"},"hide-element":{"elements":[".gitbook-link"]},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"lightbox":{"jquery":true,"sameUuid":false},"theme-comscore":{},"page-toc-button":{"maxTocDepth":2,"minTocSize":2},"back-to-top-button":{},"flexible-alerts":{"danger":{"className":"danger","icon":"fa fa-ban","label":"Attention"},"note":{"className":"info","icon":"fa fa-info-circle","label":"Note"},"style":"callout","tip":{"className":"tip","icon":"fa fa-lightbulb-o","label":"Tip"},"warning":{"className":"warning","icon":"fa fa-exclamation-triangle","label":"Warning"}},"links":{"sidebar":{"Home":"https://github.com/dunwu/gitbook-notes"}},"sharing":{"qq":true,"qzone":true,"weibo":true,"all":["weibo","qq","qzone"]},"theme-default":{"showLevel":false,"styles":{"ebook":"styles/ebook.css","epub":"styles/epub.css","mobi":"styles/mobi.css","pdf":"styles/pdf.css","print":"styles/print.css","website":"styles/website.css"}},"insert-logo":{"style":"background: none; max-height: 50px; min-height: 50px;border-radius: 50%;","url":"https://portrait.gitee.com/uploads/avatars/user/1617/4852612_MEliauk_1615280065.png!avatar60"},"expandable-chapters":{}},"theme":"default","pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"variables":{},"title":"粥可温-Bug","language":"zh-hans","gitbook":"*","description":"这真的不是我的问题啊~~~"},"file":{"path":"bug/后端/git.md","mtime":"2024-01-18T06:35:38.333Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2024-01-18T06:37:53.061Z"},"basePath":"../..","book":{"language":""}});
        });
    </script>
</div>

        
    <script src="../../gitbook/gitbook.js"></script>
    <script src="../../gitbook/theme.js"></script>
    
        
        <script src="../../gitbook/gitbook-plugin-search-pro/jquery.mark.min.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-search-pro/search.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-accordion/accordionSelector.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-lightbox/js/lightbox.min.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-livereload/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-back-to-top-button/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-splitter/splitter.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-hide-element/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-code/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-insert-logo/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-expandable-chapters/expandable-chapters.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-chapter-fold/chapter-fold.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-sharing-plus/buttons.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-page-toc-button/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-flexible-alerts/plugin.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-fontsettings/fontsettings.js"></script>
        
    
        
        <script src="../../gitbook/gitbook-plugin-theme-comscore/test.js"></script>
        
    

    </body>
</html>

